86b32d0f770e1a1a744975f46a3ce29785021fae,xwiki-core/src/main/java/com/xpn/xwiki/store/hibernate/HibernateAttachmentRecycleBinStore.java,HibernateAttachmentRecycleBinStore,restoreFromRecycleBin,#XWikiAttachment#number#XWikiContext#boolean#,83

Before Change


    public XWikiAttachment restoreFromRecycleBin(final XWikiAttachment attachment,
        final long index, final XWikiContext context, boolean bTransaction) throws XWikiException
    {
        return (XWikiAttachment) executeRead(context, bTransaction, new HibernateCallback()
        {
            public Object doInHibernate(Session session) throws HibernateException,
                XWikiException
            {
                try {
                    DeletedAttachment trashAttachment =
                        (DeletedAttachment) session.load(DeletedAttachment.class, Long
                            .valueOf(index));
                    return trashAttachment.restoreAttachment(attachment, context);
                } catch (Exception ex) {
                    return null;
                }
            }
        });
    }

    /**

After Change


    public XWikiAttachment restoreFromRecycleBin(final XWikiAttachment attachment,
        final long index, final XWikiContext context, boolean bTransaction) throws XWikiException
    {
        return executeRead(context, bTransaction, new HibernateCallback<XWikiAttachment>()
        {
            public XWikiAttachment doInHibernate(Session session) throws HibernateException,
                XWikiException
            {
                try {
                    DeletedAttachment trashAttachment =
                        (DeletedAttachment) session.load(DeletedAttachment.class, Long
                            .valueOf(index));
                    return trashAttachment.restoreAttachment(attachment, context);
                } catch (Exception ex) {
                    // Invalid recycle entry.
                    return null;
                }
            }
        });
    }

    /**